Skip to content
This repository has been archived by the owner on Aug 2, 2022. It is now read-only.

Fix slow_test stake test #163

Merged
merged 11 commits into from
Aug 15, 2017
Merged

Fix slow_test stake test #163

merged 11 commits into from
Aug 15, 2017

Conversation

brianjohnson5972
Copy link
Contributor

@brianjohnson5972 brianjohnson5972 commented Aug 11, 2017 •
edited
Loading

Fixed multiple errors preventing slow_test from passing and added slow_test to Travis build.
#161

@brianjohnson5972 brianjohnson5972 changed the title Fix slow test stake Fix slow_test stake test Aug 11, 2017
nathanielhourt
nathanielhourt reviewed Aug 11, 2017
View reviewed changes
tests/common/macro_support.hpp Outdated
@@ -146,8 +146,8 @@ inline std::vector<Name> sort_names( std::vector<Name>&& names ) {
#define STAKE4(chain, sender, recipient, amount) \
{ \
eos::chain::SignedTransaction trx; \
trx.scope = sort_names( { #sender, #recipient } ); \
trx.emplaceMessage(config::EosContractName, vector<types::AccountPermission>{{#sender, "active"}}, \
trx.scope = sort_names( { #sender, #recipient, "eos" } ); \
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's better to use config::EosContractName rather than the literal "eos". I'd like to minimize the number of places that name the contract directly.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same for lines 162 and 175... perhaps others

tests/common/macro_support.hpp Outdated
@@ -173,7 +173,7 @@ inline std::vector<Name> sort_names( std::vector<Name>&& names ) {
{ \
eos::chain::SignedTransaction trx; \
trx.scope = sort_names( { "eos", #account } ); \
trx.emplaceMessage(config::EosContractName, vector<types::AccountPermission>{{#account, "active"}}, \
trx.emplaceMessage(config::EosContractName, vector<types::AccountPermission>{}, \
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also lines 150, 164... Why remove the declared authorizations? Doesn't this make tests break? If not, something is wrong.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I removed it because it indicates irrelevant authority included and fails the test. I thought it was odd, but figured the question would be answered in this review. So how do we want to handle this? Keep this code and write a separate Issue, or should I expand this to fix the check to correctly identify the correct authorities?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So what is the verdict on this?

@brianjohnson5972
Copy link
Contributor Author

I don't know if it makes it obvious, but also notice I added fixes for test_api.

nathanielhourt
nathanielhourt reviewed Aug 15, 2017
View reviewed changes
tests/api_tests/api_tests.cpp Outdated
SetCode(chain, "acc2", test_api_wast_str.c_str());
types::setcode handler;
handler.code.resize(wasm.size());
memcpy( handler.code.data(), wasm.data(), wasm.size() );
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why memcpy if you don't have to? handler.code.assign(wasm.begin(), wasm.end()); does the resize and assign without worrying about buffer boundaries. :)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Was just copying code from create_script, so I'll clean this up.

@brianjohnson5972
Copy link
Contributor Author

@nathanhourt - Not sure if I did the right thing in eos_contract.cpp for apply_eos_setcode's setup of new apply_context for call to wasm_interface::get().init, so please comment on that.

nathanielhourt
nathanielhourt suggested changes Aug 15, 2017
View reviewed changes
Copy link
Contributor

@nathanielhourt nathanielhourt left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Update to incorporate changes in #169

nathanielhourt and others added 10 commits August 15, 2017 15:23
@nathanielhourt @brianjohnson5972
Merge apply_staked_claim into apply_eos_claim
4a881da 
The apply_staked_claim function appears to be defunct, a leftover of a
bygone era. It's logic, however, was not included in the still-active
apply_eos_claim, and that is a problem.

Move that missing logic into apply_eos_claim, pretty it up a bit, and
get rid of the vestigial apply_staked_claim.
@brianjohnson5972
adding slow_test to travis build
5021140
@brianjohnson5972
Fixed scope for STAKE and removed unneeded permissions
345c409
@brianjohnson5972
Fixed tests based off of new requirement that account be created in a…
1051b6d 
…nd in a block before it is used.
@brianjohnson5972
Fixed account name use of _ and fixed wast string.
848071c
@brianjohnson5972
Added api_test to travis build
97103de
@brianjohnson5972
Replacing eos string with config::EosContractName.
5d74854
@brianjohnson5972
Fix peer review error
0817c41
@brianjohnson5972
Fixes to get create_exchange to actually run and pass.
0289d48
@brianjohnson5972
Requiring the correct authorities
adc8fd0
@nathanielhourt
Copy link
Contributor

Looks good to me. Travis is failing because something in api_tests is exceeding a time limit, but it seems to pass fine on my computer. Do we want to do something to fix that?... CI is much less useful if it fails spuriously.

@brianjohnson5972
Copy link
Contributor Author

It passed Travis now.

@brianjohnson5972 brianjohnson5972 merged commit 85e4c46 into EOSIO:master Aug 15, 2017
@brianjohnson5972 brianjohnson5972 deleted the fix_slow_test_stake branch September 14, 2017 12:29
ljrprocc pushed a commit to bithacks-tech/myeosio that referenced this pull request Jul 4, 2018
Merge pull request EOSIO#163 from enumivo/staging
5dd6a02 
Staging
taokayan pushed a commit to taokayan/eos that referenced this pull request May 15, 2019
@larryk85
Merge pull request EOSIO#163 from conr2d/readme
3c604fb 
Update README.md
NorseGaud pushed a commit that referenced this pull request Jul 30, 2019
# This is a combination of 186 commits.
6c09577 
# This is the 1st commit message:

various improvements

# This is the commit message #2:

new hash

# This is the commit message #3:

fix for script path

# This is the commit message #4:

fixes

# This is the commit message #5:

fixes

# This is the commit message #6:

fixes

# This is the commit message #7:

fixes

# This is the commit message #8:

fixes

# This is the commit message #9:

fixes

# This is the commit message #10:

fixes

# This is the commit message #11:

fixes

# This is the commit message #12:

fixes

# This is the commit message #13:

fixes

# This is the commit message #14:

fixes

# This is the commit message #15:

fixes

# This is the commit message #16:

fixes

# This is the commit message #17:

fixes

# This is the commit message #18:

fixes

# This is the commit message #19:

fixes

# This is the commit message #20:

fixes

# This is the commit message #21:

fixes

# This is the commit message #22:

fixes

# This is the commit message #23:

fixes

# This is the commit message #24:

fixes

# This is the commit message #25:

fixes

# This is the commit message #26:

testing

# This is the commit message #27:

testing

# This is the commit message #28:

testing

# This is the commit message #29:

testing

# This is the commit message #30:

testing

# This is the commit message #31:

testing

# This is the commit message #32:

testing

# This is the commit message #33:

testing

# This is the commit message #34:

testing

# This is the commit message #35:

testing

# This is the commit message #36:

testing

# This is the commit message #37:

testing

# This is the commit message #38:

testing

# This is the commit message #39:

testing

# This is the commit message #40:

testing

# This is the commit message #41:

testing

# This is the commit message #42:

testing

# This is the commit message #43:

testing

# This is the commit message #44:

fixes

# This is the commit message #45:

fixes

# This is the commit message #46:

fixes

# This is the commit message #47:

fixes

# This is the commit message #48:

fixes

# This is the commit message #49:

fixes

# This is the commit message #50:

fixes

# This is the commit message #51:

fixes

# This is the commit message #52:

fixes

# This is the commit message #53:

fixes

# This is the commit message #54:

fixes

# This is the commit message #55:

fixes

# This is the commit message #56:

fixes

# This is the commit message #57:

fixes

# This is the commit message #58:

fixes

# This is the commit message #59:

fixes

# This is the commit message #60:

fixes

# This is the commit message #61:

fixes

# This is the commit message #62:

fixes

# This is the commit message #63:

fixes

# This is the commit message #64:

fixes

# This is the commit message #65:

fixes

# This is the commit message #66:

fixes

# This is the commit message #67:

fixes

# This is the commit message #68:

fixes

# This is the commit message #69:

fixes

# This is the commit message #70:

fixes

# This is the commit message #71:

fixes

# This is the commit message #72:

fixes

# This is the commit message #73:

fixes

# This is the commit message #74:

fixes

# This is the commit message #75:

fixes

# This is the commit message #76:

fixes

# This is the commit message #77:

fixes

# This is the commit message #78:

fixes

# This is the commit message #79:

more testing

# This is the commit message #80:

testing

# This is the commit message #81:

fixes

# This is the commit message #82:

fixes

# This is the commit message #83:

fixes

# This is the commit message #84:

fixes

# This is the commit message #85:

fixes

# This is the commit message #86:

fixes

# This is the commit message #87:

fixes

# This is the commit message #88:

fixes

# This is the commit message #89:

fixes

# This is the commit message #90:

fixes

# This is the commit message #91:

fixes

# This is the commit message #92:

fixes

# This is the commit message #93:

propagate-environment for buildkite-agent

# This is the commit message #94:

propagate-environment for buildkite-agent

# This is the commit message #95:

propagate-environment for buildkite-agent

# This is the commit message #96:

propagate-environment for buildkite-agent

# This is the commit message #97:

fixes

# This is the commit message #98:

fixes

# This is the commit message #99:

fixes

# This is the commit message #100:

fixes

# This is the commit message #101:

fixes

# This is the commit message #102:

fixes

# This is the commit message #103:

fixes

# This is the commit message #104:

fixes

# This is the commit message #105:

fixes

# This is the commit message #106:

fixes

# This is the commit message #107:

fixes

# This is the commit message #108:

fixes

# This is the commit message #109:

fixes

# This is the commit message #110:

fixes

# This is the commit message #111:

fixes

# This is the commit message #112:

fixes

# This is the commit message #113:

fixes

# This is the commit message #114:

fixes

# This is the commit message #115:

fixes

# This is the commit message #116:

fixes

# This is the commit message #117:

fixes

# This is the commit message #118:

fixes

# This is the commit message #119:

fixes

# This is the commit message #120:

fixes

# This is the commit message #121:

fixes

# This is the commit message #122:

fixes

# This is the commit message #123:

fixes

# This is the commit message #124:

fixes

# This is the commit message #125:

fixes

# This is the commit message #126:

fixes

# This is the commit message #127:

fixes

# This is the commit message #128:

fixes

# This is the commit message #129:

fixes

# This is the commit message #130:

fixes

# This is the commit message #131:

fixes

# This is the commit message #132:

fixes

# This is the commit message #133:

fixes

# This is the commit message #134:

fixes

# This is the commit message #135:

fixes

# This is the commit message #136:

fixes

# This is the commit message #137:

fixes

# This is the commit message #138:

fixes

# This is the commit message #139:

fixes

# This is the commit message #140:

fixes

# This is the commit message #141:

fixes

# This is the commit message #142:

fixes

# This is the commit message #143:

fixes

# This is the commit message #144:

fixes

# This is the commit message #145:

fixes

# This is the commit message #146:

fixes

# This is the commit message #147:

fixes

# This is the commit message #148:

fixes

# This is the commit message #149:

fixes

# This is the commit message #150:

fixes

# This is the commit message #151:

fixes

# This is the commit message #152:

fixes

# This is the commit message #153:

testing

# This is the commit message #154:

fixes

# This is the commit message #155:

fixes

# This is the commit message #156:

fixes

# This is the commit message #157:

fixes

# This is the commit message #158:

fixes

# This is the commit message #159:

fixes

# This is the commit message #160:

fixes

# This is the commit message #161:

fixes

# This is the commit message #162:

fixes

# This is the commit message #163:

fixes

# This is the commit message #164:

fixes

# This is the commit message #165:

fixes

# This is the commit message #166:

fixes

# This is the commit message #167:

fixes

# This is the commit message #168:

fixes

# This is the commit message #169:

fixes

# This is the commit message #170:

fixes

# This is the commit message #171:

fixes

# This is the commit message #172:

fixes

# This is the commit message #173:

fixes

# This is the commit message #174:

fixes

# This is the commit message #175:

fixes

# This is the commit message #176:

fixes

# This is the commit message #177:

fixes

# This is the commit message #178:

fixes

# This is the commit message #179:

fixes

# This is the commit message #180:

fixes

# This is the commit message #181:

fixes

# This is the commit message #182:

fixes

# This is the commit message #183:

fixes

# This is the commit message #184:

fixes

# This is the commit message #185:

fixes

# This is the commit message #186:

fixes
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@nathanielhourt nathanielhourt nathanielhourt approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@brianjohnson5972 @nathanielhourt